fixed null button bug