Fixed bug #215