Fix calendar crash

Related to #216 where...