Fix so that this works in single player properly