Fixed error when injected to another class
Razr fixes
Razr fixes