Fixed a crash problem
Merge branch 'deatached'