Fix constructor issue. Tested. Working.