Remember to include an entry in CHANGES_NEXT_RELEASE about this fix (including the reference to #223)