Fixed bug #15