Issue 25: Unable to compile RSP in 0.7