RowContainer bug fix