Fixing highlighting issue with properties (#40)