Adding back fix for shell quote