Impoved origin/path checking