some changes

brute force bug fix.