Measurement fix by @endryha (issue #1)

Prevents notifyDataSetChanged problems.