[MYM] refactor bug correction