Fix to restrict to known paths