Fixed constructor & possible infinite loop
Fixed constructor & possible infinite loop