fixed Simons mess