Fixed with revision 592