Fixed weekend bug