Temp fix for move slow and clear