final fix for issue #19