fixed bug with queueing and asynchrosity