hopefully this will solve all the bugs