Bugfix for Calendar Types

See Commit to 2.4.x
Bugfix bubbles down