Speculative fix for #891.