more changes for compatibility with MR2.1