fix multiple buttons bug in agile