Merge "Fix compiler warning"