Missed a cast - but only add it when needed