Hotfix for errors on calendar array