Bug fix:out of memory