Crash Fixed, but doesn't work well