Fixed when using inventory..
Moved use from switch to a separate method.