fix consumer bugs