Fix fw processing