Fix spurious bucket empty events