Temp fix for Charlie issue, RPIGS