Merge "Fix undefined behavior"