[bug] Trying to fix equality testing