Minor change in rmi layer