Fixes the RP issue