Fix initialization crash

Fixes #471 && #543