Fixed calendar to accept any type of calendar