Please, include a reference to this fix in the CHANGES_NEXT_RELEASE (with a reference to #219)