Fixed infinite constructor loop