bugfix : calendar object needs to be wrapped in calendar