Core/Spectator - Fix Wrong lines