Solution for issue #82