FW-176. Fix from Cédric Adjih.