attempt to resolve #8