Should fix BT#7603 / #6803