Fixing objects diff order