final fix for issue #55