Fix node expansion