fix for issue #137