modified CommonUtils