Fixed Injection Issue
Fixed Image Factory