fix function and catch nodes