Fixed bug with struct init