Fix interaction with calendar