fix for issue #12