Fix hiding issue