fixed add button handling