Added hack to be able fix dynamic columns names