isn't this simple enough to be included in this PR?