reverted my "fixes", seems like they work only with the latest (dev) rhino version, which isn't that helpful