Further adventures in reflection. Fixed