Fixed issue with side-loading.