Fix regression with boundslayout