Fixed scatter bugs