fix back to trunk