Fixed bug #87