fixes for RD