Removed unnecessary escaping that was causing bugs