minor changes - bug not yet fixed

Mantis #0000003