final fix for issue #12