Fixing scruitinizer issue