Fixed problem with weekends