StdControlled moved to correct location