Bug Fix : Calendar duplication issue fixes

Calendar duplication issue fixed