Fix for calendar display problem