Fixed fundef bug
Merged