Fixed issue with constructor params