Removed recursive call to firmware