removed some risky constructor callings