fixed bug 1234