This is the appropriate fix.