Bugfixing in Calendar mapping