Bug fix :(