Fix might not return