annoying bug fixing