fixing property bugs
fixing property bugs