Fixed bug relative to the new architecture