fix getInstance
fix equals