solve fixes