Fixed suggesting properties
Merged fix for suggesting properties