Just moved a bit of code around.