Fixed bug 303