fix bug 1000795 Border Change