Wait for fix from #132