Fixed property weirdness better.