Fix for async command/response tracking