Fixed bug 254