Solved a bug