Fix sub requests #1339