[d1x/f39] (2 commits) ...fix