Issue #67. Make sure this is the right fix.