Out of working hours bug fix