Fix issue with time slots management