Bug surface size align adjusted matrix

@wgester @timjchin @ftripier Care to take a look?