Forgive for the noise, I just double checked the patch and noticed the `current-prefix-arg' was still being used. Fixed.