[xroar/f31] (3 commits) ...fix conditional