Final fix for issue #86?