Fix for com_finder