Issue #506 fixing errors while adding model answer