Changes for #287