Belt and braces for #395.