*Deprecated warning fix