Fixed bug with queued operations