Finish what @wafcio started

Fixes #4