fixed super annoying bug #42