Fixed a design mistake