Fix select matrix & etc.