bug fix, internal consumers weren't disposed correctly