Fixing Rpc spec for 1.8.7