Crashed bug fixed