Fixed bug 230