Fix the embedded shell