Fix node creation