Implementation for #434