Fix with correctness is done