Fix #66, at least partially. We'll probably need a better fix in the future, but this *should* work for now.