Added a fix which catches the small calendar color problem we were having