Code Cleanup: Fixed targetting crash