Calendar Bug fixed