Merge "Fix style error"