working on fixing crash.