fixes SEC-2656