Bugfixing: BZ 411,412