Fixed one bug and another appears