Added guard on oppo move