Fixed #40 for realsies, I promise