Bugfix for calendar dates being double-toggled in OS simulator