Added the done fix