Fixed method handling bug