fix for issue #128