Fix scopes

Fixes: #18.