Finally the crash is fixed