FIX proper inititalization