Add #401.

Related to #401.
I don't know if it makes sense to put this in the CHANGELOG.. thoughts @atoum/all ?