Fix wrong usages, closes #9