adapting to 1.8.0 compiler
3 files changed