Fixed Calendar Bug