Somehow this wasn't included in the last commit (oops)