Re-add fix from #151