Remove bug fixed