onCreate order fix