cancel button bug fixed