Fixing the missing submission context