Issue #95: proposed bugfix