fixes #24 for real this time, and fixes #27
rebuild