Fix sub requests #1339

same here as above