Fixed #64 (I hope; let's UX test.)