Issue #30: Quick fix.