Function proxy dirty implementation #53