Merge "Fixed as code optimization"