I've fixed this already...unless this is duplicated code...?