Button bug fixed