Fixed refactoring in items