porting rmatter fix from stinger-svn