Fixes #162

@bcardarella + @twokul