Workaround for #5962