Should solve the bugs