Fixed bug #45