Fixed bug 16