Fixed the constructer