FIX #108, this is what happens when I should had gone to sleep :)