Sync:fix Mastersource Bug (2 days done...)