Fixed Demo Crashes, Thanks @skrew.