Another take on the consumption bug

Needs extensively testing before going live