Argghh, actually doing what the previous commit meant to do