Solution B-fix