Second attempted fix of undefined location