Fixed want/done logic