Hopefully fix an issue with RPs