adding support for #173