#18. Reflection fixes