Fixed bug that was caching duplicate measurements