Re-fix issue #18.