Fixed bug with different column and property names