Part of #493, follow up of #495
Part of #493, follow up of #495