Fix master by using Vec and adjusting