Fixed bug 1234