Fix bugs calendar