Debugged for crash
Debugged (again) ...:)