Bug fix, missing columns in output