Fix some issue with semicolon