#1646 | Removed duplicate code, chnaged spilt button behavior