fix Bug #15032