Fixed Fotter, for now.

Trial merge.