fix implentation for handling NA MOE. (#1)