Workaround for #4232