Avoid inline anonymouse functions