fix for issue #126