Simple fix in architecture