Updated for compatibility with RJW 4.8.1.1.