Fixed bug #14