attempt to resolve #212