Fixed #22 ... again.