Bug fix thanks to username
