Fix bug - correct answer choice was considered wrong
Merge bug fix from 1.7
Merge bug fix from 1.7