Reparameterize section

This is a minimal way to fix #217, putting this here for discussion.