Calendar Plus Issue #193