Fix commad with tags