Fixing the unfolding (issue #98)

Fixing the issue #98. Does this look about right?