Fixing layout see BT#8663