better fix for ignoring disabled package classes that doesn't search them twice