Fix DAY_OF_WEEK, better code