Fix for class property in groups