Trying to fix Epic's problem