fix properties handling