Fixed cancel button in PROD