This is the fix from #15.