Hopefully fixed location and crashing issues