Fix --exec, taking a9ef14a2e into mind.