Fixed removing from buffer and dispatching