Copy of Structure 2.3.4 with patch applied to fix seg fault