Fix Calendar Controls‏ issue