Fix for itemwait