a little less intrusive fix