Bug fix iin Accept answer