Split function calls to avoid php notice
Merge pull request #385 from stefk/split-calls

Split function calls to avoid php notice