[fix] problem with on changes and o2m