"Function binding" fix