Fixed button freezing issue