restored fast call optimization after pull request #151