Improved last commit after more Outlook's brain damange findings