Fixed interaction with calendar