#1293 added more layout fix