Bug960611+bug958200