Hotfix

Modified constructor