Applying suggested fix in issue 191.