solve 23, fix 21