Added patch to fix calendar issue