Incorrect ordering of Flat properties in class constructor fixed.