Fix bug reported by @frenzykryger with non-escaped commands