Fix doubled up calls again