Fix duplicate function call #16