Bug remove fixed