Fixed last commit to be correct in all cases.