fix 1297
problem 1644
problem 1014