Bug fixing the topology. See previous commits