fix interrupted based solution