Fixed redundant calls