Another 1584 tweak