Perhaps this will fix #584?

So all field will be initialized on star and not left to chance.