Fixed the MODE bug