Revised fixed for issue #85