FW-182. Fix from AlaeddineWeslati in #47.