ninja fix (+1 squashed commits)

Squashed commits:

[e5759dd] now items are registered properly