changes for #171