Fixing the two button issue