Fix sameday bug