Partial fix from #109