fixed issue with calendar week