This fixes the immediate exploit caused by #5

The underlying problem persists, however.