matrix fix?
merge