Hotfix - Arguments not passing to constructor