Thanks to David Sommerseth for this commit.