Cancel Button fix