Fix #53: issues with Monday as first day of week