Changes for #229