Fix Operation Id problem