changes for #68