adapt to latest master updates
1 file changed