Add Shell escaping back