UPDATED: change long for french language support