FIX tested: memory leak

replace Queue with SimpleQueue