JButton fixed
merge fix commit2