Fixed bug #146