/ fixed bugs introduced by the fix for bug #4368 by kpfleming