Bug fix on limited number of attempts