Implement issue 606

This fixes issue #606