Dict compliant behaviour.

see #585