Fixing exports3 hardcoding