Fixed #74. Seems to wrapping around just fine now.