Fixed bug #43