Fixing button bug