Will require test, will do in new PR.