Fixed build issue for 3.5