allowing compilation with OASIS too
completed