Common API JS modules load fix