Fix for change in organization and where EXP is