Bug fix and change evaluation paramater