Fixed issue with day gaps