Fixed bug #79