Fixed a smart design choice...