Improve handling of source state reads