Oops, rushed that last commit (added else return this time)