bug fixes for RTR