Fixed DuplicateKeys on day push