Fixed bug #17