Merge "fix format method (case sensitive)"