Patch issue #459

Simple and effective.

Fixes a regression not covered by tests #459