Should be final fix for issue #146