[TIMOB-12986] Fixed some bugs surrounding queued functions
Merge pull request #113 from bryan-m-hughes/timob-12986

[TIMOB-12986] Fixed some bugs surrounding queued functions