Issue #212: proposed bugfix