Fixed issue where the calendar change event would be fired twice