Fixed looping bug (disambiguation was wrong)