Bugfix when not using property or tab attribute.