Fixed work with calendar