Rift : Performance fix