One of these days I'll get a commit right the first time :)