small chenges for #248