Bugfix properly migrating old format to new one