Fix bug CRASH 113