Another attempt at eliminating warning.