Make sure bug 1014475 and 950673 work well