Fixed bug 123