- fixed null injection