changed for #45