Fixing up random controllers