BRANCH 4.1: fixed faulty logic on dynamic loading.