Fix Compile & Crash!