Fixed deprecated finder issue