Heikki staying with McLaren