galfar-coder fix from Dino0040