Bringing code in line with K-9 4.901