Fix to allow body to be function