Fixed push deliver-before-timestamp