Fix #4

Finally! Oh my fingers...