Fixed week resolution bug (Date and Calendar have different year formats)