Fix for issue #130