Issue #40: Fixes.