fix for issue #159