Changes for #421