Fixed paths again for primary domain