speculative fix for #2365