calendar form fix