Fix shell shock