fix for issue #156