Use non-deprecated function