Fix drawing order with embedded group