Fix initialization crash
Merge pull request #552 from RavetcoFX/a3

Fix initialization crash