fix properties mapping