Fix shell movement