focus regression fix