Revert "Function fix"

This reverts commit 3109db8068cd5177398a8bbc5c262804e2a13f44.