fixed: removed the dedicated dispatcher for Rhino