Issue #406 continued