Little bug fix

mainly for Sync Branch