Fix for issue #184