Hacked around #94, should work now. Need people to test it.