Fixed reflection issues