Fix for #4.

Changes the API a bit, but no can do.