Fixed #1 on github for real this time.