fixed what i think should have been fixed