Final fix for RMI shit.