Troubles with reflection.

Had some troubles with reflection, so I did some changes that I believe
will help further.