Fixed the Calendar Widget problem