Fixes regressions caused by #98