removed annoying bug take 3.