Fixed bug #66