Fixed quickcall related issues
Merge pull request #342 from dgilbert/bugfix-quickcall

Fixed quickcall related issues - hahaha, well thats embarrassing, Thanks!