Fix it finally