Fix oops with dynamic data and 1.7.0 merge