Merge "Fixed signal 11 bug by not testing resolved method first."