Added a proper initialization