Fixed bug #97