Fix bug Bill