Fixed the issue with the crashing...hopefully