solves bug 1321