#7385: BUGFIXING - IN PROGRESS