Fixed problems on expandible (rows and struct)