Additional protection, for the Savannah ticket #68145 (M. Ivanov)