Fixed bug #24