Fix #17, for real this time.