Long double patch 8 of N: make it partially work in