fix for issue #20