changes recommended for #47