closes #395

As requested in previous pull request