Fixed calendar Alpha 6.1