Address comments: protect from double loading