Bug fixes #2731 and #2730 - chained measurements are no longer possible.