* Fixed bugs introduced in revision 1.564 by rob ;)