Final fix to compile with 4.7