Fixed the discard controller issues