Upgrade to NarLayout21 (does not seem to give any changes)