Fixed by revision 107314