Fixes yaybu/yaybu#135