Can handle this in a new PR I guess