Rerolling #20. I am not sure what the patch in #23 was trying to do and there...