Fixed contructor