Changes for #228