Fixed the issue with item handling.