fix for issue #136