Looks like this will be less of an issue in the next version due to rp changes