remove debug code + bugfix for case with to few parameters