Ok so since there is no attention about shapes for D6, here is a patch that fixes some code.
Could you commit this to 6.x-2.0 branch ?
big thx