Fix Crash of 4.0.4