Transfered object functions to normal functions. Fixes #11