Addresses #5, but slower than a permanent fix.