fix proposal for issue #7