I've done a workaround for the beta test, but I'll fix it for the final submission if we can find a solution.
