fixing same day issue