RPI compilation fixed