Temporary fix for not finding some types