Fixed some issues when answering the question