Schema compatibility fix

There was a bug that manifested only once merged