Solved bugs