fix for issue #130