Fix usage of commandsService's functions
Merge pull request #410 from Icenium/fatme/waits

Fix usage of commandsService's functions