Bug fix (--columns has been broken for last couple of days)