I am not sure about this change. We should rather initialise things properly in a more explicit way.
Could you come up with a nice way? :D