Fix with return codes