Fix no add button issue