Hrmpf. Close #52. It's getting emerassing...