fixing weekend bug