Fixed bug 43904 (partially)