Final fix (hopefully)