Fix 6f3582e (YO DAWG), finally fixes #417