Fixed bug in crash fix.