add tmp bugfix wilcard handler function