Fix for #43