fixes properties grouping