bug fix on main calendar