changing queue implementation to homebrew, introduced a bug
fixing bug