Solved reflection issues