Plan/DB: Added fix to answer function.