Assume default 'rect' shape if non defined. Fixes #631