Re-added the code to fix Calendar disappear issue