Fixed bug 265