Fix sub requests #1339

Done