fix'd annoying bug