Solved some bug