Fixed an issue making sometimes items with special values loos their
values