Fixed bug 66517 by avoiding the margin altogether