Try prevent memory problem, minor performance improvement