Sample + fix