Bug Fix : Calendar duplication issue fixes