Finally, fixed the Monday bug