#368 Fix Property handling