Fix salts not taking into account classes as arguments