Fixes broken initializaiton issue