Solved bugs :)