Fix support for Rhino