Fix for #149 Adopt RAP 2.1