bugfixings ticket 7187