fixed for functions and regexp