Fixed item use Partially solves problems in #2