fix master repeated loading modules bug

Change-Id: Iee1868f8c08f763390d30a0c2102b694a013d8cf