Finally get reflection right