Fix for bug #43