Bread crumbs for external firms fix.

Signed-off-by: plamen911 <plamen@lynxlake.org>