Also fixed a bug in the rdiff handler that caused a unary operation error if
the variable wasn't fixed