Fixed bug with weekday wrapping