Use findByClientId instead of find