Hopefully Fix #102

Possibly not merge-worth yet.