Fixed @cyrilf's merge