Hopefully fixed jump and errors.