Fixes regressions #1173 and #1174
0.39.2