fixed compilation with latest master changes