Troubles with reflection.

I don't know if it was just me, but I had some troubles with reflection, so I did some changes that I believe
will help further. Please, take a look.