Quick hack to get around quoted arguments