Merge fix #255 poke @alucard62