Initialization bugfix