Fixed previous fix (issue #9).