Issue #62. Fix.