Gotta fix something first