Topic location fix