Change to make this compile with latest SDK