Fixing another bug with Button