Fixed bug #1073 and #1075: Segmentation fault with internal functions calling internal functions.
Merged pull request #123