A better fix for issue #1.