Some properties were not correctly setted on storage; fixes #357