This code should not appear here... It's from #627...