added support to r#8.0 (untested yet)