merge fix from #61