Fix Desync issue