Another fix for the user week order problem