final fix for issue #8