* Workaround to prevent data loss if apply is hit but not OK or Cancel * Refactor required to fix this issue