* Fixed bugs introduced in revision 1.155 by rob ;)