Solve Quote Tool issue