yeah good point. Looks like we really need CGLIB here. I'll move it back but we have to revist this at some point