Fixing bug which was found in master branch. Check button bug fixing.