add 22 and 23 bug