Fixed #29 for real this time.