hopefuly fixed an annoying bug