Fix unwrap

This PR fixes #2.