Final fix for issue #957