Fix #280 - calendar conversion