incorporate @steventlamb's comment