Fixed calendar issue Refs#203