changed based on jbuck;s comment in PR