Fixed bug #23