@raw and @print fixed