Fixes cancel button crash on CalVC
Merge https://github.com/mbsdev/MBS-Now