It shouldn't seg fault anymore