#839 and it's the same but it's cherry picked so it's not

#839 and it's the same but it's cherry picked so it's not #385