Fixed #17 and repairs the aftermath.