Fixed bug #24.