Fix Raw method bug (producing duplicated output)