first quick and dirty hack to make extra parameters work