Fix problem if data rquires same module and module values rewroted
Merge branch 'dev'