Fix for assembly searching