Added a fix for missing maker data