Result handling has been slightly improved.