Reflection bug fix